Auto merge of #1270 - alexcrichton:issue-1105, r=brson
authorbors <bors@rust-lang.org>
Fri, 6 Feb 2015 22:44:07 +0000 (22:44 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Feb 2015 22:44:07 +0000 (22:44 +0000)
commitfc777654e9898cb471ed87a733a3077f96beaf0d
tree5afe6bdd313d97ded09f96438e9ddf9d0a9be330
parentcf22066eb4a57b6e169922ca1c4a51942fdf8926
parent70eecd3daf07cf0b25d574d5164c4e361d88d51b
Auto merge of #1270 - alexcrichton:issue-1105, r=brson

Closes #1105
src/cargo/ops/cargo_generate_lockfile.rs
src/cargo/sources/registry.rs
tests/test_cargo_registry.rs